增加筛选项
2 changed files with 8 additions and 3 deletions
+ 4
- 3
api/admin_views.py
@@ -1703,12 +1703,13 @@ def complement_code_contacted(request, administrator): |
||
| 1703 | 1703 |
def administrator_list(request, administrator): |
| 1704 | 1704 |
page = request.POST.get('page', 1)
|
| 1705 | 1705 |
num = request.POST.get('num', 20)
|
| 1706 |
- |
|
| 1707 |
- if administrator.admin_type != AdministratorInfo.ADMINISTRATOR: |
|
| 1708 |
- return response(AdministratorStatusCode.ADMINISTRATOR_PERMISSION_DENIED) |
|
| 1706 |
+ admin_type = request.POST.get('admin_type', '')
|
|
| 1709 | 1707 |
|
| 1710 | 1708 |
logs = AdministratorInfo.objects.filter(status=True).order_by('-created_at')
|
| 1711 | 1709 |
|
| 1710 |
+ if admin_type: |
|
| 1711 |
+ logs = logs.filter(admin_type=admin_type) |
|
| 1712 |
+ |
|
| 1712 | 1713 |
count = logs.count() |
| 1713 | 1714 |
logs, left = pagination(logs, page, num) |
| 1714 | 1715 |
logs = [log.admindata for log in logs] |
+ 4
- 0
api/tenancy_admin_views.py
@@ -125,6 +125,7 @@ def shot_request_list(request, administrator): |
||
| 125 | 125 |
num = request.POST.get('num', 20)
|
| 126 | 126 |
query = request.POST.get('query', '')
|
| 127 | 127 |
model_id = request.POST.get('model_id', '')
|
| 128 |
+ target_admin_id = request.POST.get('target_admin_id', '')
|
|
| 128 | 129 |
start_time = request.POST.get('start_time', '')
|
| 129 | 130 |
end_time = request.POST.get('end_time', '')
|
| 130 | 131 |
request_status = request.POST.get('request_status', 'all')
|
@@ -138,6 +139,9 @@ def shot_request_list(request, administrator): |
||
| 138 | 139 |
if model_id: |
| 139 | 140 |
reqs = reqs.filter(model_id=model_id) |
| 140 | 141 |
|
| 142 |
+ if target_admin_id: |
|
| 143 |
+ reqs = reqs.filter(admin_id=target_admin_id) |
|
| 144 |
+ |
|
| 141 | 145 |
if request_status != 'all': |
| 142 | 146 |
reqs = reqs.filter(request_status=request_status) |
| 143 | 147 |
|